From: Raghuveer Kasaraneni <raghu@kasara.net>
Date: Mon, 12 Apr 2021 10:56:28 +0000 (+0200)
Subject: dash: Fixes wrong separator position
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~574^2^2~43
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=07579f05f69b22ee4bafffa5bee8e514b7ce8ca1;p=gnome-shell.git

dash: Fixes wrong separator position

Sometimes when an icon is dragged and dropped in Dash, one Favourite app icon
can appear to the right of Dash separator. This can happen when available system
resources are low and the PlaceHolder destroy animation is delayed and the
corresponding container child is still present. With this commit the separator
position is calculated correctly, even when the animation is pending.

Fixes #3966, #3799

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1804>
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index aca1ddfd5..08902c436 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -807,7 +807,7 @@ var Dash = GObject.registerClass({
                 });
                 this._box.add_child(this._separator);
             }
-            let pos = nFavorites;
+            let pos = nFavorites + this._animatingPlaceholdersCount;
             if (this._dragPlaceholder)
                 pos++;
             this._box.set_child_at_index(this._separator, pos);